gtkcustompaperunixdialog: unseal private pointer
authorJavier Jardón <jjardon@gnome.org>
Wed, 2 Jun 2010 03:31:23 +0000 (05:31 +0200)
committerJavier Jardón <jjardon@gnome.org>
Tue, 13 Jul 2010 17:40:46 +0000 (19:40 +0200)
gtk/gtkcustompaperunixdialog.c
gtk/gtkcustompaperunixdialog.h

index 28120b1e82da544fa600776d4016b4c68e0bdaf1..cc95bec46ad2a3253cf3257afb5521052e197212 100644 (file)
@@ -49,7 +49,7 @@ typedef struct
   GtkWidget *spin_button;
 } UnitWidget;
 
-struct GtkCustomPaperUnixDialogPrivate
+struct _GtkCustomPaperUnixDialogPrivate
 {
 
   GtkWidget *treeview;
@@ -86,10 +86,9 @@ enum {
   PRINTER_LIST_N_COLS
 };
 
+
 G_DEFINE_TYPE (GtkCustomPaperUnixDialog, gtk_custom_paper_unix_dialog, GTK_TYPE_DIALOG)
 
-#define GTK_CUSTOM_PAPER_UNIX_DIALOG_GET_PRIVATE(o)  \
-   (G_TYPE_INSTANCE_GET_PRIVATE ((o), GTK_TYPE_CUSTOM_PAPER_UNIX_DIALOG, GtkCustomPaperUnixDialogPrivate))
 
 static void gtk_custom_paper_unix_dialog_finalize  (GObject                *object);
 static void populate_dialog                        (GtkCustomPaperUnixDialog *dialog);
@@ -272,7 +271,10 @@ gtk_custom_paper_unix_dialog_init (GtkCustomPaperUnixDialog *dialog)
   GtkCustomPaperUnixDialogPrivate *priv;
   GtkTreeIter iter;
 
-  priv = dialog->priv = GTK_CUSTOM_PAPER_UNIX_DIALOG_GET_PRIVATE (dialog);
+  dialog->priv = G_TYPE_INSTANCE_GET_PRIVATE (dialog,
+                                              GTK_TYPE_CUSTOM_PAPER_UNIX_DIALOG,
+                                              GtkCustomPaperUnixDialogPrivate);
+  priv = dialog->priv;
 
   priv->print_backends = NULL;
 
index 0ff3af165d206cd2cb41b719486ce7d1ec42ca41..acb31634f731c7f42867dec1f92aa9c6b54feba2 100644 (file)
@@ -34,13 +34,13 @@ G_BEGIN_DECLS
 
 typedef struct _GtkCustomPaperUnixDialog         GtkCustomPaperUnixDialog;
 typedef struct _GtkCustomPaperUnixDialogClass    GtkCustomPaperUnixDialogClass;
-typedef struct GtkCustomPaperUnixDialogPrivate   GtkCustomPaperUnixDialogPrivate;
+typedef struct _GtkCustomPaperUnixDialogPrivate  GtkCustomPaperUnixDialogPrivate;
 
 struct _GtkCustomPaperUnixDialog
 {
   GtkDialog parent_instance;
 
-  GtkCustomPaperUnixDialogPrivate *GSEAL (priv);
+  GtkCustomPaperUnixDialogPrivate *priv;
 };
 
 struct _GtkCustomPaperUnixDialogClass